Filtering: NonApplicability improvements by mdvictor · Pull Request #1373 · grafana/scenes

mdvictor · 2026-02-26T09:25:36Z

Improves the filtering non-applicability system:

cached pre-query filter and groupBy verification calls in the SQR
better applicability retrieval matching (e.g.: in the recommendations system), based on the fact that the DS will return the filters in the same order as they were sent
caching for global variable level non applicability
exposes getter to be used outside the drilldown manager, e.g.: in the panel subheader showing per panel non applicable filters and groupBys

📦 Published PR as canary version: 7.2.0--canary.1373.22950463934.0

✨ Test out this PR locally via:

npm install @grafana/scenes@7.2.0--canary.1373.22950463934.0
npm install @grafana/scenes-react@7.2.0--canary.1373.22950463934.0
# or 
yarn add @grafana/scenes@7.2.0--canary.1373.22950463934.0
yarn add @grafana/scenes-react@7.2.0--canary.1373.22950463934.0

mdvictor · 2026-03-02T14:22:21Z

packages/scenes/src/variables/adhoc/AdHocFiltersVariable.tsx

+    const originFilters = this.state.originFilters?.filter((f) => f.key !== filter.key && !f.nonApplicable) ?? [];
+    const otherFilters = this.state.filters
+      .filter((f) => f.key !== filter.key && !f.nonApplicable)
+      .concat(originFilters);


we need to check in values too for non applicability, otherwise if we have some nonapplicable filters and search for values, nothing will come up because of that nonexistent label being set on the query

packages/scenes/src/variables/applicabilityUtils.ts

mdvictor · 2026-03-03T12:25:04Z

packages/scenes/src/variables/DrilldownDependenciesManager.ts

+    const filtersApplicabilityEnabled = this._adhocFiltersVar?.state.applicabilityEnabled;
+    const groupByApplicabilityEnabled = this._groupByVar?.state.applicabilityEnabled;
+
+    if (!filtersApplicabilityEnabled && !groupByApplicabilityEnabled) {


this is basically the grafana FF check

dprokop

Good idea to centralize the logic. Please adress my comments before we continue.

dprokop · 2026-03-16T10:32:42Z

packages/scenes/src/querying/SceneQueryRunner.ts


      this._drilldownDependenciesManager.findAndSubscribeToDrilldowns(ds.uid, this);

+      await this._drilldownDependenciesManager.resolveApplicability(


Do we need to await here? This is gonna block query execution. Maybe instead just fire this funtion without await.

we could let it fire and not block querying but then we would cancel inflights and requuery as soon as applicability resolves so we get the correct filters for the given queries

dprokop · 2026-03-16T10:46:01Z

packages/scenes/src/variables/adhoc/AdHocFiltersVariable.tsx

        }
      });
-
-      this.setState({ applicabilityEnabled: false });


is ths intentional?

yes, that was causing some issues now that we set that prop through the ff in grafana

dprokop · 2026-03-16T10:49:26Z

packages/scenes/src/variables/applicabilityUtils.ts

+export function buildApplicabilityCacheKey(parts: {
+  filters?: Array<{ origin?: string; key: string; operator: string; value: string; values?: string[] }>;
+  groupByKeys?: string[];
+  value?: string[];


what's this?

we use this util to limit applicability calls -- if nothing changes, then we dont rerun the call with the same values basically

oh nvm I think you're asking about the specific value param, I think that's not needed and I missed it, will doublecheck

dprokop · 2026-03-16T10:58:15Z

packages/scenes/src/variables/DrilldownDependenciesManager.ts

+
+    const stateFilters = this._adhocFiltersVar.state.filters;
+    const originFilters = this._adhocFiltersVar.state.originFilters ?? [];
+    const allFilters = [...originFilters, ...stateFilters];


Sanity check - does it matter that in the adhoc filters we create const filters = [...this.state.filters, ...(this.state.originFilters ?? [])]; ? Reversed order

good call, yeah this should be consistent and originfilters should be first by convention

I've modified the adhoc to be consistent, the origin filters were put last mainly because it was easier and order didnt matter -- it still doesnt for origin ones vs non origin ones -- it matters mostly for same type of filters with same key (e.g. I have 2 user filters env=prod and then env=dev, the latter one should take priority and overwrite the first, this doesnt happen for origin and user ones because of the origin property delimitation)

dprokop · 2026-03-16T11:07:27Z

packages/scenes/src/variables/applicabilityUtils.ts

+  groupByKeys?: string[];
+  value?: string[];


why did you separate these two? IIUC these properties are used in the code to represent the same thing - group by keys.

yes I think you are right, the value is unneeded

removed value, unneeded

dprokop · 2026-03-16T11:08:12Z

packages/scenes/src/variables/applicabilityUtils.ts

+}
+
+function normalizeQuery(q: SceneDataQuery): { refId: string; expr?: unknown } {
+  return { refId: q.refId, expr: q.expr ?? q.expression ?? q.query };


very prometheus-yyyyyy :)

🤦🏼 focused so much on prometheus this slipped, I'm looking into it

mdvictor · 2026-03-18T12:52:45Z

packages/scenes/src/variables/groupby/GroupByRecommendations.tsx

    const json = store.get(this._getStorageKey());
    const storedGroupings = json ? JSON.parse(json) : [];

-    if (storedGroupings.length > 0) {


got rid of these extra requests for now since this will also be unified

mdvictor · 2026-03-18T12:53:35Z

packages/scenes/src/variables/groupby/GroupByVariable.tsx

    return applicableValues;
  }

-  public async getGroupByApplicabilityForQueries(


same here, just removed functionality to have less requests, again will be solved by unification later

mdvictor · 2026-03-20T08:31:02Z

packages/scenes/src/variables/adhoc/AdHocFiltersVariable.tsx

+      return this._resolvedDs;
+    }
+
+    const ds = await this._dataSourceSrv.get(this.state.datasource, this._scopedVars);


reusing scopedVars from the adhoc in the recomendations as well ( through this method that is reused there), i reckon thats fine

mdvictor · 2026-03-20T08:33:02Z

packages/scenes/src/variables/groupby/GroupByRecommendations.test.tsx

    it('should add value to parent variable', async () => {
      const getRecommendedDrilldowns = jest.fn().mockResolvedValue(undefined);
-      const getDrilldownsApplicability = jest.fn().mockResolvedValue(undefined);
+      const getDrilldownsApplicability = jest.fn().mockResolvedValue(new Map([['_default_', []]]));


at this point i think everything groupBy can be ignored, this will be removed after unification

mdvictor · 2026-03-20T08:36:21Z

packages/scenes/src/variables/DrilldownDependenciesManager.ts

-          (f) => isFilterComplete(f) && isFilterApplicable(f)
-        )
-      : undefined;
+    if (!this._adhocFiltersVar) {


this entire manager will get very thin after the unification, basically it would just deal with adhoc subscription and fetching filters... might not even need it at all we'll see

mdvictor added 2 commits February 24, 2026 15:40

per panel non applicability

ab898b3

fix

7413638

mdvictor changed the title ~~Mdv/non applicable filters prometheus~~ Filtering: NonApplicability improvements Feb 26, 2026

mdvictor requested a review from kristinademeshchik February 27, 2026 09:01

mdvictor added 3 commits February 27, 2026 16:26

refactor

33b4091

refactor

bea96d7

Merge branch 'main' into mdv/non-applicable-filters-prometheus

e6e7296

mdvictor mentioned this pull request Feb 27, 2026

Filtering: NonApplicability improvements and Prometheus support grafana/grafana#119071

Open

3 tasks

refactor

3f5d04a

mdvictor commented Mar 2, 2026

View reviewed changes

fix + tests

25b514e

mdvictor commented Mar 3, 2026

View reviewed changes

packages/scenes/src/variables/applicabilityUtils.ts Show resolved Hide resolved

mdvictor added 2 commits March 3, 2026 13:48

add extra gate

5c146bc

fix

b24b42f

mdvictor added minor Increment the minor version when merged release Create a release when this pr is merged labels Mar 3, 2026

mdvictor commented Mar 3, 2026

View reviewed changes

mdvictor added 2 commits March 3, 2026 14:25

fix tests

90de9f9

enforce feature toggle

d510a18

mdvictor requested a review from dprokop March 5, 2026 09:27

mdvictor added 8 commits March 5, 2026 11:50

test fixes + cache

22231aa

use stringify for caching

76582e9

merge

1ea1e59

fix

5d7ed6e

fix

0b5806a

fix test

cfbfa10

fix

78beba4

fix tests, order of filters must be maintained

d7f4cb5

mdvictor marked this pull request as ready for review March 9, 2026 12:21

fix

dc5fd3c

fix

cdae7e7

dprokop reviewed Mar 16, 2026

View reviewed changes

mdvictor added 3 commits March 16, 2026 15:43

fixes

6723f29

remove query caching -- keep it only for filters/groupBys/scopes

e32af32

refactor applicability, remove some groupBy logic

65b52e4

mdvictor commented Mar 18, 2026

View reviewed changes

fixes

200f5fc

mdvictor commented Mar 20, 2026

View reviewed changes

mdvictor added 2 commits March 20, 2026 11:21

fixes

5769a1f

fix

7543750


		this._drilldownDependenciesManager.findAndSubscribeToDrilldowns(ds.uid, this);

		await this._drilldownDependenciesManager.resolveApplicability(

Conversation

mdvictor commented Feb 26, 2026 • edited by scenes-repo-bot-access-token bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dprokop left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mdvictor commented Feb 26, 2026 •

edited by scenes-repo-bot-access-token bot

Loading